auto merge of #972 : alexcrichton/cargo/issue-969, r=huonw
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 05:59:18 +0000 (05:59 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 05:59:18 +0000 (05:59 +0000)
Closes #969


Trivial merge